Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 27 Jul 2005 10:54:39 +0000 (10:54 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 27 Jul 2005 10:54:39 +0000 (10:54 +0000)
Signed-off-by: Steven Smith, sos22@cam.ac.uk

Trivial merge